3to4: Remove GtkToolbar::toolbar_style

The property was removed (with the rest of the widget),
so keeping it around in the ui file makes no sense.

Testcase included.

diff --git a/gtk/tools/gtk-builder-tool-simplify.c b/gtk/tools/gtk-builder-tool-simplify.c
index 0541207a97952791c83b2f180d104658910a6a66..b61487c53774e3a1ae25535dea78b1c7e433939e 100644 (file)
--- a/gtk/tools/gtk-builder-tool-simplify.c
+++ b/gtk/tools/gtk-builder-tool-simplify.c
@@ -1723,6 +1723,20 @@ rewrite_toolbar (Element      *element,
 
   set_attribute_value (element, "class", "GtkBox");
 
+  for (l = element->children; l; l = l->next)
+    {
+      Element *child = l->data;
+
+      if (g_str_equal (child->element_name, "property") &&
+          (has_attribute (child, "name", "toolbar_style") ||
+           has_attribute (child, "name", "toolbar-style")))
+        {
+          element->children = g_list_remove (element->children, child);
+          free_element (child);
+          break;
+        }
+    }
+
   for (l = element->children; l; l = l->next)
     {
       Element *child = l->data;

diff --git a/testsuite/tools/simplify-data-3to4/toolbar.ui b/testsuite/tools/simplify-data-3to4/toolbar.ui
index 3f45466024ab1618bf7ad887e7d17f43f7598608..d695a41b6b01d46d4c260d8ceded80f911e743aa 100644 (file)
--- a/testsuite/tools/simplify-data-3to4/toolbar.ui
+++ b/testsuite/tools/simplify-data-3to4/toolbar.ui
@@ -3,6 +3,7 @@
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkToolbar">
     <property name="visible">1</property>
+    <property name="toolbar_style">both</property>
     <child>
       <object class="GtkToolButton">
         <property name="visible">1</property>